From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 13 Jan 2014 22:12:16 +0000 (-0500)
Subject: background: Don't require passing in a background to _updateBackground()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2929
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=933f38390ba1512aa87c91bd52e9729d2524b6c0;p=gnome-shell.git

background: Don't require passing in a background to _updateBackground()

To make debugging background issues easier.
---

diff --git a/js/ui/background.js b/js/ui/background.js
index 5eab83aa7..8d0b5f194 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -733,17 +733,17 @@ const BackgroundManager = new Lang.Class({
         }
     },
 
-    _updateBackground: function(background) {
+    _updateBackground: function() {
         let newBackground = this._createBackground();
-        newBackground.vignetteSharpness = background.vignetteSharpness;
-        newBackground.brightness = background.brightness;
-        newBackground.visible = background.visible;
+        newBackground.vignetteSharpness = this.background.vignetteSharpness;
+        newBackground.brightness = this.background.brightness;
+        newBackground.visible = this.background.visible;
 
         newBackground.loadedSignalId = newBackground.connect('loaded',
             Lang.bind(this, function() {
                 newBackground.disconnect(newBackground.loadedSignalId);
                 newBackground.loadedSignalId = 0;
-                Tweener.addTween(background.actor,
+                Tweener.addTween(this.background.actor,
                                  { opacity: 0,
                                    time: FADE_ANIMATION_TIME,
                                    transition: 'easeOutQuad',
@@ -755,8 +755,7 @@ const BackgroundManager = new Lang.Class({
                                            newBackground.actor.destroy();
                                        }
 
-                                       background.actor.destroy();
-
+                                       this.background.actor.destroy();
                                        this.emit('changed');
                                    })
                                  });
@@ -783,7 +782,7 @@ const BackgroundManager = new Lang.Class({
         background.changeSignalId = background.connect('changed', Lang.bind(this, function() {
             background.disconnect(background.changeSignalId);
             background.changeSignalId = 0;
-            this._updateBackground(background);
+            this._updateBackground();
         }));
 
         background.actor.connect('destroy', Lang.bind(this, function() {